merge emacs-23
authorKenichi Handa <handa@m17n.org>
Tue, 4 Jan 2011 06:57:54 +0000 (15:57 +0900)
committerKenichi Handa <handa@m17n.org>
Tue, 4 Jan 2011 06:57:54 +0000 (15:57 +0900)

Trivial merge